Merge branch 'upstream'
authorBernd Zeimetz <bernd@bzed.de>
Sat, 9 Jan 2016 20:57:49 +0000 (21:57 +0100)
committerBernd Zeimetz <bernd@bzed.de>
Sat, 9 Jan 2016 20:57:49 +0000 (21:57 +0100)
commit41ba336cf53af79e93b5f87a592f60086657a9a9
tree8fed16d05c98162094f11d69042060cf511462f1
parent7e6f206b61d811fd2ebb8c6afde8c7e5bf7bb8b2
parentf6fb8e643e2b4e53c6297ab834d97ecbad598bc2
Merge branch 'upstream'